Auto merge of #4714 - Mark-Simulacrum:frozen-freezes, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 12 Nov 2017 19:13:19 +0000 (19:13 +0000)
committerbors <bors@rust-lang.org>
Sun, 12 Nov 2017 19:13:19 +0000 (19:13 +0000)
commitabd137ad14a8f352b48f24b11c3995d716deb260
treefede191f7f8215d2b3bff49f75d34731d8fa907d
parente945a90541575e67407c4e3294f717d6268bc60b
parent89023dce73d709c088cc90781056ddd2f825b39a
Auto merge of #4714 - Mark-Simulacrum:frozen-freezes, r=alexcrichton

Do not update semantically equivalent lockfiles with --frozen/--locked.

A previous patch in #4684 attempted to fix this, but didn't work for the
case where the [root] crate wasn't the first crate in the sorted package
array.

cc @matklad -- fixes a problem noted in https://github.com/rust-lang/cargo/pull/4684#discussion_r147824900 which appears to have gone unfixed

r? @alexcrichton

Beta backport will be posted as soon as this is reviewed. Merges cleanly.